Antonin Delpeuch

Antonin Delpeuch is an independent developer who publishes Mergiraf, a syntax-aware git merge driver that automatically resolves merge conflicts for code written in an expanding set of programming languages and data formats. Designed for developers who routinely collaborate through git repositories, Mergiraf parses the abstract syntax tree of each file involved in a merge, identifies conflicting regions that can be reconciled at the structural level, and produces a valid output that preserves indentation, comments, and language-specific constructs. Typical use cases include simultaneous edits to Python, JavaScript, Go, Rust, or JSON files where traditional line-based merging would flag false conflicts, as well as large-scale refactors that touch many modules and would otherwise require manual rebasing. Because the tool integrates directly into git’s merge machinery, teams can adopt it project-wide by registering the driver in .gitattributes, after which any pull or rebase operation benefits from language-aware resolution without extra commands. Experimental support for XML, YAML, TOML, and several DSLs is under active development, and community contributions extend language grammars through a declarative interface. Mergiraf is available for free on get.nero.com, where the latest Windows build is delivered through trusted package sources such as winget, ensuring up-to-date installations and allowing users to add the merge driver to a batch of development utilities installed in one pass.